From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Fri, 14 Oct 2011 21:57:46 +0000 (-0400)
Subject: extensionSystem: Load user extensions after system ones
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~7452
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=82ed80c9c3f4d1d631c796357bc8900c765cc69b;p=gnome-shell.git

extensionSystem: Load user extensions after system ones

https://bugzilla.gnome.org/show_bug.cgi?id=661815
---

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index d1f53ef19..f31f2b48c 100644
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -450,7 +450,6 @@ function _loadExtensionsIn(dir, type) {
 }
 
 function loadExtensions() {
-    _loadExtensionsIn(userExtensionsDir, ExtensionType.PER_USER);
     let systemDataDirs = GLib.get_system_data_dirs();
     for (let i = 0; i < systemDataDirs.length; i++) {
         let dirPath = systemDataDirs[i] + '/gnome-shell/extensions';
@@ -458,6 +457,7 @@ function loadExtensions() {
         if (dir.query_exists(null))
             _loadExtensionsIn(dir, ExtensionType.SYSTEM);
     }
+    _loadExtensionsIn(userExtensionsDir, ExtensionType.PER_USER);
 }
 
 function InstallExtensionDialog(uuid, version_tag, name) {